From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Fri, 17 Oct 2008 09:24:57 +0000 (+0900)
Subject: [IA64] clean up of xenpage.h
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14068
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=fa8cae582d12614316cfa090fe0c358ce52cc3e2;p=xen.git

[IA64] clean up of xenpage.h

remove nasty undefs in xenpage.h.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---

diff --git a/xen/include/asm-ia64/linux-xen/asm/page.h b/xen/include/asm-ia64/linux-xen/asm/page.h
index 28ec059605..14a7216ad2 100644
--- a/xen/include/asm-ia64/linux-xen/asm/page.h
+++ b/xen/include/asm-ia64/linux-xen/asm/page.h
@@ -99,6 +99,7 @@ do {						\
 
 #define virt_addr_valid(kaddr)	mfn_valid(__pa(kaddr) >> PAGE_SHIFT)
 
+#ifndef XEN
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 extern int ia64_mfn_valid (unsigned long pfn);
 #else
@@ -119,6 +120,7 @@ extern unsigned long max_low_pfn;
 
 #define page_to_maddr(page)	(page_to_mfn(page) << PAGE_SHIFT)
 #define virt_to_page(kaddr)	mfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
+#endif
 
 typedef union ia64_va {
 	struct {
diff --git a/xen/include/asm-ia64/xenpage.h b/xen/include/asm-ia64/xenpage.h
index 7425bc22c5..71f6abfc14 100644
--- a/xen/include/asm-ia64/xenpage.h
+++ b/xen/include/asm-ia64/xenpage.h
@@ -5,11 +5,7 @@
 #define IA64_MAX_PHYS_BITS	50	/* max. number of physical address bits (architected) */
 
 #ifndef __ASSEMBLY__
-#undef mfn_valid
-#undef page_to_mfn
-#undef mfn_to_page
 #ifdef CONFIG_VIRTUAL_FRAME_TABLE
-#undef ia64_mfn_valid
 extern int ia64_mfn_valid (unsigned long pfn);
 # define mfn_valid(_pfn)	(((_pfn) < max_page) && ia64_mfn_valid(_pfn))
 #else
@@ -37,8 +33,6 @@ static inline unsigned long __virt_to_maddr(unsigned long va)
 #define virt_to_maddr(va)	(__virt_to_maddr((unsigned long)va))
 
 
-#undef page_to_maddr
-#undef virt_to_page
 #define page_to_maddr(page)	(page_to_mfn(page) << PAGE_SHIFT)
 #define virt_to_page(kaddr)	(mfn_to_page(virt_to_maddr(kaddr) >> PAGE_SHIFT))
 
@@ -97,8 +91,6 @@ static inline u64 pa_clear_uc(u64 paddr)
     return (paddr << 1) >> 1;
 }
 
-#undef __pa
-#undef __va
 #define __pa(x)		(virt_to_maddr(x))
 #define __va(x)		({xen_va _v; _v.l = (long) (x); _v.f.reg = -1; _v.p;})